From 775b2d5a8808df2522ce6f00a3b7dcf70db5f0bd Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Tue, 14 Oct 2008 21:25:46 -0700 Subject: [PATCH] Invoke xmlstarlet as xmlstarlet rather than as xml. --- debian/changelog | 5 +++- .../fix-flymake-xmlstarlet-invocation.diff | 24 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 debian/patches/fix-flymake-xmlstarlet-invocation.diff diff --git a/debian/changelog b/debian/changelog index 5a315feb388..4bf73a71f31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,10 @@ emacs22 (22.2+2-4) unstable; urgency=medium Joachim and Michael Berg . (closes: #499568) - -- Rob Browning Tue, 14 Oct 2008 21:15:42 -0700 + * Invoke xmlstarlet from flymake as xmlstarlet rather than xml. Thanks + to Jussi Judin . (closes: 447378) + + -- Rob Browning Tue, 14 Oct 2008 21:22:59 -0700 emacs22 (22.2+2-3) unstable; urgency=medium diff --git a/debian/patches/fix-flymake-xmlstarlet-invocation.diff b/debian/patches/fix-flymake-xmlstarlet-invocation.diff new file mode 100644 index 00000000000..471df2f5114 --- /dev/null +++ b/debian/patches/fix-flymake-xmlstarlet-invocation.diff @@ -0,0 +1,24 @@ +* Emacs now invokes the correct xmlstarlet executable on Debian systems. + Patch: fix-flymake-xmlstarlet-invocation.diff + Provided-by: Jussi Judin + Date: Sat, 20 Oct 2007 14:42:02 UTC + Added-by: Rob Browning + Status: Debian specific + Bug: 447378 + + Emacs invokes xmlstarlet rather than xml, which is the correct + executable name on Debian systems. + +Index: sid/lisp/progmodes/flymake.el +=================================================================== +--- sid.orig/lisp/progmodes/flymake.el ++++ sid/lisp/progmodes/flymake.el +@@ -1756,7 +1756,7 @@ + + ;;;; xml-specific init-cleanup routines + (defun flymake-xml-init () +- (list "xml" (list "val" (flymake-init-create-temp-buffer-copy 'flymake-create-temp-inplace)))) ++ (list "xmlstarlet" (list "val" (flymake-init-create-temp-buffer-copy 'flymake-create-temp-inplace)))) + + (provide 'flymake) + diff --git a/debian/patches/series b/debian/patches/series index 85887617b46..f5560549cbe 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,4 +13,5 @@ fix-mule-select-safe-coding.diff look-for-news-to-find-etc.diff fix-woman2-th.diff fix-python-module-handling-cve-2008-3949.diff +fix-flymake-xmlstarlet-invocation.diff autofiles.diff -- 2.30.2